Few modifications
Merge pull request #46 from pbrunet/europar2013

Few modifications