Updated specs
Merge branch 'dev'