refactor
Merge pull request #72 from Trott/specs

refactor