Merging and testing issues
Merge branch 'master' of https://github.com/ahenrycgi/charme_plugin