Typesetting change
Interaction with users
Merge branch 'lee' into develop