grahamc Merge pull request #229 from bignaux/patch-1 …