Merge pull request #1 from grierson/master

a
Merge pull request #2 from grierson/HEAD

Merge pull request #1 from grierson/master