Untag more specs
Merge pull request #707 from jstepien/untag-more-specs

Untag more specs