Added partial terminal window sizing support (no resizing handling)
Merge branch 'terminal'