Updated Changelog and Documentation
Merge pull request #1 from kerinova/development

Sync with master
Merge pull request #2 from kerinova/master

sync