Specs refactoring.
Merge pull request #4 from iliabylich/specs-refactoring

Specs refactoring.