diff support
Merge pull request #123 from SharadGandhi/diff-support

diff support - merge to unstable