couple of changes
Merge pull request #1 from jsm85/master

couple of changes