Upgraded to CDK 1.5.4 and CDK-JChemPaint 31