fixed #3
Merge branch 'issue3'