Pierrick review
Merge pull request #148 from pbrunet/sc2013

Pierrick review