Added self.ops
Merge origin/master
Merge remote-tracking branch 'parent/master'