Merge pull request #2 from rg3/master