Merge pull request #1 from Heather/master

lesser code maid, warning driven