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