Modified control of input behaviour
Merge branch 'master' of https://github.com/Ndushi/iMat