added diff stuff
Merge pull request #4 from vforgione/dev

added diff stuff