Formatting
Formatting
v0.6.16 Fix issue #67
Merge branch 'development'
Merge branch 'development'