v0.3
Merge branch 'master' into heroku