compile errors again
Merge branch 'devel'