Brought up to date with master
Changed NFFT to integer to avoid warning
Merge branch 'ER' of github.com:lscsoft/pcat into ETG_challenge