Fixed some cucumber
Fixed some cucumber
Merged master