Changes motivated from reviewer comments
Merge pull request #2 from LannyRipple/master

Changes motivated from reviewer comments