added some more checks
Merge pull request #458 from hhovsepy/master

more checks are added