MR updated as per #7.