Feature/ctrl c.1

@Cokenias DO NOT MERGE

This branch includes the features in branch feature/improved-with-unit-test currently being reviewed in PR #2.
We should rebase after PR #2 is approved and merged.

However, you might want to try out this version. Note that Travis is green for this branch,
and it supports using ctrl-C to clear the input when the prompt is '... '.