Fixed #11 close
Merge branch 'hotfix/Issue#11'