update to devel branch (set_timer bugfixes)