changes to discussion re: ed comments
Merge branch 'master' into compile
build