image fix
Merge branch 'devel'