New readme.md and fix
Merge branch 'develop'