consistent callbacks
Merge branch 'devel'