Backport of #113 from master.
Version bump
Merge pull request #118 from noxiouz/backport_of_more_talkative_locator

Backport of more talkative locator