incorporated torbs PR from master