minor cleanup
fix merge
fix self-calling mtd
Merge branch 'master' of git://github.com/gwentacle/dash into gwentacle-master