adding specs
Merge branch 'master' into public