work on annotation support
merge
Merge branch 'master' of https://github.com/eugeis/ee-mdd