Update to 0.7
Merge pull request #3 from flowersinthesand/master

Update to 0.7