Fixed #10 close
Merge branch 'hotfix/Isssue#10v7'