Updated to use Khepri V1.x, fixes #13