updates for consistency pointed out by Henry
Merge pull request #38 from smirolo/master

updates for consistency pointed out by Henry