Merge pull request #5 from mcdonaldjc/patch-1