Input validation is now working properly, but not prettily
Merge branch 'master' of https://github.com/Ndushi/iMat