Merge pull request #26 from shykes/refactor_dm

Refactor dm
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm