V 0.0.20 - Build in support for timeout. Updated test to include timeout.