Merge pull request #4 from DanGrayson/master

trivial changes
needed but trivial changes -- "apply pr2" doesn't work at my end.