Fixes #132.
Merge pull request #539 from philipn/standard_conforming_remove

Fixes #132.