V2 19-12-2012
Merge pull request #1 from Drykes/master

proposition V2 19-12-2012