minor edits discussion
removed discussion heading
Merge branch 'master' into compile
build