Refactor feature spec
Merge pull request #8 from ruedap/refactor

Refactor feature spec