Improvements/fixes
Merge branch 'devel'