Added more parameter validation
Merge branch 'mytest2'