added features for cucumber
merging