Refactoring trying to fix some logic issues
bumping version and adding CHANGELOG entry
Fix issue #81