General improvements
Merge remote-tracking branch 'origin/devel'