Some updates
Merge pull request #27 from gouwestadmm/lex

Some updates