Add id as possible property on Lexicon
Some minor fixes
Merge branch 'master' into gh-pages