some minor edits
some minor edits
Merge 07/03
Merge origin/master
Merge 07/03