fix #11
Merge branch 'hotfix/fix_10'