Correct analyzer syntax.
Add @Martin-Grunewald as watcher.
Merge pull request #272 from ktf/add-Martin

Misc fixes.