Final merge
Merge pull request #668 from emmanuel-keller/master

Final merge