Added more validation for input

#63
#51
Merge branch 'ui/victor' into parser/Victor