Fixing issues.
Merge branch 'master' of github.com:nemanja-tomic/Konteh