Make timeout a user setting (bugs #469)