Adjusted timeouts closes #17