pedantic changes
merged changes
Merge pull request #1 from seanwolter/master

changes you didn't even ask for