Merge branch 'fix/oddfft' (closes #207)