refactor
Merge pull request #71 from Trott/specs

refactor