fix a bug
add new feature
Merge branch 'bug-fix' into feture-one