Merge pull request #4 from neilbowers/master