code refactor
Merge branch 'master' into Version-1.0