Fix Issue #19
Merge branch 'hotfix/v0.2.6-BETA'