small bugfixes round 1
Merge branch 'master' of https://github.com/Avenel/FirstApp