Merge dedx into master

Since making branch, I haven't done anything to master and dedx works very well