Updating to pure 0.5.0
Merge pull request #1 from sunewt/master

Updating to pure 0.5.0