Merge pull request #101 from prattmic/master