Merge pull request #2 from skranz/master

Update
better bargaining diagnostics
Merge pull request #6 from MartinKies/master

better bargaining diagnostics