Merge pull request #2042 from ffaex/add_fn