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