gitignore updated.
Added unit tests.
Updated the changelog
Merge branch 'develop'