Fixed some merge problems
Added Morphologic operations support.