fix bug
fix bug on issue-101
modify on dev
merged