Merge pull request #1 from thisMagpie/devel

Merge Development with Master
Merge branch 'master' of http://github.com/thismagpie/fftw3 into devel