Cleaning up PR #24 - Feature Additions