Merge pull request #256 from apenney/supported-142