Merge pull request #644 from eputnam/spec_opts