Merge pull request #234 from TopherMan/feature/M26