More robust handling of user input.
Merge branch 'master' of github.com:tebello-thejane/creis