Better output, different negotiation algorithm
Merge branch 'master' of https://github.com/robert-schmidtke/map