implemented #39 with additional func field