Merge pull request #87 from alfeko/alexbranch

Alexbranch
Merge branch 'dmpbranchv3'
Panelstuff
fix
Merge branch 'dmpbranchv3'