adhintz Merge pull request #110 from adhintz/master