Setup cucumber
Merge changes