Merge pull request #244 from mpbl/devel

Devel
Revert "Devel"