Merge pull request #47 from nickdesaulniers/master