Refactored steps fixing feature associated steps.
Finished steps refactioring and closed #2.
Merged with master.
Merge pull request #18 from henriquecf/2-refactor-features

2 refactor features