use proper characters for comments
change partial configuration to resolve lexer, parser, and linker errors
Merge remote-tracking branch 'upstream/master'