added enoise
Merge branch 'devel'