Cleanup and bugfix of dft module
Merge pull request #28 from suttonpd/master

Cleanup and bugfix of dft module