Merge pull request #51 from nickdesaulniers/master