simplify stty configuration (fixes #47, hopefully)
Merge remote-tracking branch 'upstream/master'