Fixed timeout to more reasonable amount. Upped version.