Merge pull request #4 from gregrgay/master