added timouts, and tests
version 0.0.14