merge  Devel 1.0 to master