fix dependency
Merge branch 'devel'