Version 0.4 prep
Merge pull request #538 from ChrisBeaumont/0.4-sprint

Version 0.4 prep