Merge pull request #2 from tsclausing/master

A little cleanup and some fixes