Merge branch 'master' into working
Fix indentation
Merge branch 'working'
Fix indentation
Fix lexer to allow any character in comments
Merge branch 'working'