Merge pull request #1 from dbetebenner/master

Update to 0.5-0.0