Update to v0.0.7
Merge branch 'update' into update.macosx