Began implimenting Issue #17 - Check CHANGELOG.md for detailed information