Merge pull request #1 from CTownsdin/master

gj!