Merge pull request #375 from euanh/spec-wrapper

Small fixes
Merge pull request #376 from euanh/spec-wrapper

Spec wrapper