fixed 2 critical bugs
Merge branch 'master' of https://github.com/yasabere/ppdpApp