updated readme and changelog
changelog
changelog
Merge branch '1.2' into 1.3
updated readme