merging/fixes
Merge branch 'master' of github.com:rasmuswissmann/EMDP