Merge pull request #102 from prattmic/master