Merge branch 'sr/add--interactive-term-readkey'