fixed #3
Merge branch 'issue-3'