only use one directory
Merge branch 'devel'