#1 Modified validation
Merge branch 'issue/1'