A cleaner implementation of the __check__ functionality
Merge pull request #93 from kefirbandi/Check2

A cleaner implementation of the __check__ functionality