Merge pull request #34 from lategoodbye/master

Address check functions
Fix undeclared variable
Merge pull request #35 from aleax/bugfix

Fix undeclared variable