Merge pull request #103 from mattmiller/master