interface edits
minor edit
Merge branch 'master' into gh-pages