Merge pull request #1158 from ahomatthew/develop

Fixes
fixing SHAN-52 #comment memory leak, plugged
Merge pull request #1159 from Tendrid/develop

fixing SHAN-52 #comment memory leak, plugged
Updates to tolerances