Merge pull request #16 from tadgerb/patch-1