Added some basic tags to features.
Added
Merge remote-tracking branch 'origin/master'