Improving code of Algorithm and Operator
Merge branch 'merging'