complete bugofix with date and title
Merge branch 'lex'