Merge pull request #58 from nickdesaulniers/master