Added timeout option and more tests
release 0.0.3