Fixed issue with empty value checker. Fixes #87
Merge branch 'hotfix/issue_87'