Make it stricter.
Merge pull request #92 from nZEDb/dev

Make it stricter.