0.1.5 timeout setting, locator bug fix