Merge branch 'master' into pretty
blue buttons
Merge pull request #119 from askaway/pretty

Pretty