Merge pull request #90 from luke-jr/patch-1