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