Modification of annotations
Merged
Merge branch 'master' of https://github.com/ahenrycgi/charme_plugin
Merge complete, bugs remain