added support for underscore in variable names