init
Merge https://github.com/juancarlospaco/diff