Merge pull request #1 from zfields/master

So it begins - in Mexico.