minor edits results
Merge branch 'master' into compile