Fix issues #131 and #132 to get more readable output on failures#133

ijt wants to merge 5 commits intoproper-testing:masterproper-testing/proper:masterfrom

ijt:masterijt/proper:masterCopy head branch name to clipboard