Merge branch 'refactor'
some little changes to fix bug
Merge branch 'master'