Fixed compAdd, issue #40
Fixed merge