Merge pull request #105 from prattmic/master