Added self.ops
Merge origin/master