Merge branch 'hotfix/0.0.2'
Merge branch 'master' of heroku.com:safe-beach-8053

* 'master' of heroku.com:safe-beach-8053: