chris-armstrong Merge pull request #28 from chris-armstrong/chris-armstrong-patch-1