fix #13
Merge branch 'hotfix/fix.13'