remove hardcoded timeout (closes #8)