Merge pull request #100 from prattmic/master