Merge pull request #3 from coreyal/master

We did it!