Merge pull request #76 from prattmic/master