Fixed very critical bugs
Merge branch 'master' of https://github.com/Avenel/FirstApp