Merge pull request #17 from CharString/master

Pass arguments to custom expectations.
Show diff in error msg when repr is long.