Merge pull request #1 from jasoncartermartin/master

First commit