Fixed a merge issue and added cucumber doc