minor changes discussion
Merge branch 'master' into compile
build