Using rspec filters works better

And this will make merging back to master cleaner
Merge pull request #238 from hunner/clean_conditional

Using rspec filters works better