Updated change log
Merge branch 'develop'