Merge pull request #9 from TopherJonesy/master

4.1.2