Merge pull request #63 from alfeko/master

Updating with master
Merge pull request #65 from alfeko/dmpbranch

Merge pull request #63 from alfeko/master