document setting
reset state if expecting user input
fix bug
Added tag 1.8.5 for changeset 40a1f4ddb346