fix bug
Merge branch 'issue-#001'

merge issue-#001 branch into master