Merge pull request #28 from alanhogan/patch-1