dmpe Merge pull request #18 from andodet/addin