Changed all the things.
Merge pull request #3 from mattvagni/master

Changed all the things.