Added just a few fixes
Merge branch 'master' of https://github.com/Gabilon/programaMyHonor.git