Merge branch 'dev'
README update
Merge branch 'master' into dev
some little changes