Merge pull request #6 from gregrgay/master