add is_running support - adjust to coding standard