Merge changes from Master. Update version number to 1.2
Merge branch 'master' into dev-1.2
Update readme.txt & changelog