Merge pull request #253 from ifad/feature/modernize-convert-params

Merge pull request #253 from ifad/feature/modernize-convert-params #319