More bug-fixes
Merge branch 'master' of https://github.com/eudyptula/Encourage