Input validation
Merge pull request #8 from user2509848/patch-7

Input validation