update docs and add change log
Merge branch 'develop'