Improvements and Bug Fixes
Merge pull request #8 from drberry85/master

Improvements and Bug Fixes