Clarify spec
Merge branch 'master' into solution