Ship 0.4.0

Fixes #37, #20
Merge pull request #38 from bfirsh/ship-0.4.0

Ship 0.4.0