Merge
Added convolution (not working fine)