change all the things
Merge pull request #1 from mpmont/master

change all the things