1e93e24 Merge pull request #1 from RobJohnston/master