Merge .fn as discussed in #23