Merge pull request #44 from brianjmiller/master

Couple of quick enhancements