Merge pull request #11 from rplevy/master

    make gui-diff a macro
fix the gui-diff macro and its test