Merge pull request #21 from cameronfletcher/dev

Release v0.4
Merge pull request #22 from cameronfletcher/release

Release v0.4
#23 Creating development branch for release v0.5