Merge pull request #27 from MechStar/master

Added support for diffs (Issue #3)