Addresses issue #2, providing pretty print of kwargs on errors.
Merge remote-tracking branch 'upstream/master'