minor editing
reorder references
Merge branch 'origin/master'