merge fix
merge fix parameter-jac
added variables