enhancements.
Merge pull request #45 from kylerush/enhancements

Enhancements