Updated to CgLib 3.1