Applied patches from TheCaptain
Merge branch 'master' of github.com:apg/more-modest