cleanup
Merge branch 'master' into devel
bugfix - missing '\' :(