Bugfix: identifiers containing '$' symbol are valid now