Fix #10
Merge branch 'hotfix/0.2.6'
Merge tag 'v0.2.6' into develop

Version 0.2.6