closes #6
Merge branch 'development'
Bump version v0.6.4