merge with latest vitaut/format

merge with latest vitaut/format and adds support for error messages with
original format string