Merge pull request #1332 from ne0fhyk/master

Minor bug fixes
Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into bug_fixes