Version update
Readme fix
Merge branch 'develop'