Resolve #6. Ready for 0.7.0
Merge branch 'release/v0.7.0' into develop