Minor edits.
Merge branch 'devel' into files