Merge pull request #2 from lukesturgeon/master

Master