Update readme
Update version
Upload lib
Resolve conflict