Merge pull request #1 from rg3/master

Update