Introduce `disambiguate: true` option for formatting
Merge pull request #438 from edwinv/master

Introduce `disambiguate: true` option for formatting