merge master
Merge readme change
Fixed failing tests
merge dev
Merge rc1