minor edit
Merge branch 'jn'