applied a patch for #225
Merge branch 'master' into open-push