Merge pull request #9 from justincampbell/spec-refactor

Spec refactor