Made check optional
Merge pull request #6 from keithj/devel

Made check optional