Merge pull request #2 from mrquincle/master

Merge back to master