Merge pull request #1 from Drykes/master

proposition V2
V3 22-12-2012
Merge pull request #2 from tchhay/master

V3 22-12-2012