Merge pull request #913 from jm4R/terminal_on_windows