Finished Issue #12 Couple other fixes, check CHANGELOG.md