Issue #11 Fix
Merge branch 'develop'
0.0.22