Upgrade to 0.4.0.
Merge pull request #1 from disko/master

Upgrade to 0.4.0