Additional options, bug fix, and some refactoring for Mdjup filter