Refactored
Merge pull request #5 from jostly/issue/1

#1 Refactored specifications to be more modular