Merge pull request #17 from TopherJonesy/master

4.2.3