Pierrick review
Merge pull request #152 from pbrunet/cc2014

Pierrick review