Cleaned up a little the code of the specification lexer.
Merge branch 'master' into working-on-model-loading