fixed
Merge branch 'issue-6'