Fixed the inclusion of fftw3.h
Merge remote-tracking branch 'upstream/master' into workingBranch