Merge pull request #3 from nessthehero/master

Upgrade to v0.4.0