Fixes issue #463 concerning linear filtering
Fix for issue #448
Merge pull request #467 from PGGB/master

Fixes #448 and #463
Merge remote-tracking branch 'upstream/master'