CS fixes
Documentation updates
Updating CHANGELOG.md
Merge pull request #23 from burzum/develop

Develop