deleted enoise_with_generate
Merge branch 'devel'