Merge pull request #1 from mattcifelli/master

Booyah!