Add function/wrap. Fixes #179