Work on Dommel support. Issue #12