Updates to spec and README
Merge branch 'master' into solution