Upgraded to JTrim 1.6.0