fixed
Merge branch 'issue-7'