minor updates
Merge branch 'devel'