Update to last interface
Merge branch 'master' of https://github.com/jmecosta/CxxPlugin