Minor changes
Update readme
Merge remote-tracking branch 'origin/master' into manti-by-dev
Merge remote-tracking branch 'origin/manti-by-dev'
Update readme
Merge remote-tracking branch 'origin/manti-by-dev'