#60 remove setTimeout dependency