Updating to latest specs
Merge pull request #1233 from christav/update-specs

Update specs