Merge pull request #153 from adamretter/develop

[bugfix] Set the lexical handler so that Comments etc are not lost