Merge pull request #19 from nickdesaulniers/issue4