Merge pull request #1 from jgm/master

Merge