rplevy Merge pull request #26 from marctrem/master …