Init timeout

Based on top of PRs #16, #18 & #19