Merge pull request #188 from Ventrella/master

I have a bunch of things to pull.