Fix #115; add execute callback