Merge pull request #1 from grierson/master

a