Merge pull request #109 from brentdmiller/master