patch for #268
Merge branch 'dev2' into test