Add input validity checks
Merge branch 'master' of https://github.com/alexandrebouchard/westrun