Merge branch 'master' into devel
Fixed cat error
Merge branch 'devel'