Added undoing of typed words
Merging with master