fixed some minor bugs
Merge branch 'master' of https://github.com/omid111/wakeupPro