Update readme
Fix bug
Merge branch 'master' into rider20