Merge pull request #541 from brooksryba/develop

Develop
allow user-defined messages in tolerances
Merge pull request #542 from demaagdk/develop

allow user-defined messages in tolerances