ackdo-reloaded.0.4, diff coloring, bug fix
Merge pull request #779 from rgrinberg/master

ackdo-reloaded.0.4