Merge pull request #140 from edofic/master

macros: Key annotation
macros: skip unknown annotations