Feature/153 validate user inputs

Feature/153 validate user inputs