Merge pull request #1 from paradix/master

Latest Yohan's fixes