Imagine filter improved - fixes #32