Merge pull request #1 from kylejfox/master

Talk about how awesome git people are.