Merge branch 'master' into develop
Added a change log
Updated readme
Merge branch 'develop'