Upgraded to JTrim 1.7.0