Merge branch 'release/0.4.1' into develop
add Heroku deploy step for Wercker
bump version number
Merge branch 'release/0.4.2'