Merge pull request #49 from nickdesaulniers/master