Merge branch 'master' of https://github.com/bednorz35/fftw-convolution
Merge branch 'master' of https://github.com/bednorz35/fftw-convolution