Add in timeout and bump version