Merge pull request #171 from electrical/master

[TESTING] make strict variable checking optional