Merge pull request #55 from nickdesaulniers/master