Moved to new version of PEGjs and fixed a couple of issues (lacking chars in regexp)