Adding input parameters validation
Merge branch 'input_validation'