Initial fix.
Merge branch 'master' into 66-diff
Revert verstion.
Merge master.
Merge pull request #70 from chevah/66-diff

Fix --diff option