Merge pull request #36 from solidsnack/master

Release 0.4.0