Merge pull request #3 from r-hayes/master

Update