Merge pull request #24 from bcail/master

update mods annotation handling