Added ability to use underscore in variable names