Fixed bug in master-terminal mock-up.
Re-factored and finished implementation of terminal. fixes #11