Merge pull request from miroslavpejic85/master ✨Bug fixing and improvements