Input parameter validation
Merge pull request #235 from siburny/master

Input parameter validation