Merge pull request #15 from TopherJonesy/master

4.2.3