Removed template definitions that C++11 made unnecessary
Fix for FFT
Merge pull request #223 from izaid/refactor

Refactor