Add readme
Merge branch '1.2' into 1.3
Update documentation
Merge branch '1.3'
Update documentation