j0k3r Merge pull request #80 from jtojnar/stricter