moving feature files to feature directory and some comments/minor changes
Merge pull request #2 from tansaku/master

moving feature files to feature directory and some comments/minor changes