Merge pull request #69 from alfeko/master

Master update
Merge pull request #73 from alfeko/dmpbranch

Merge pull request #69 from alfeko/master