Merge branch 'hotfix/0.1'
Try to resolve issue deploying to Heroku.
Merge branch 'hotfix/0.2' into develop