Integrated Issue #23 - Couple other changes, check CHANGELOG.md