rcannood Merge branch 'devel'