Integrated Issue #24 - various other changes. Check CHANGELOG.md