MBH: changes
Merge branch 'devel'