couple of updates
Merge pull request #5 from CowanSM/master

couple of updates