v0.4
Merge pull request #2 from dcangst/dev

v0.4