Update to 0.7
Merge pull request #1 from chatellier/master

Update to 0.7