Added basic timeout function, updated to 1.2