Patch for #309
Merge branch 'devel'