Merge pull request #5 from TopherJonesy/master

4.1