Updated CHANGELOG
Merge branch 'master' into dev/add.version
Refactoring into class