Added option for timeout override
Added test for timeout. Looking good.
Updated documentation
Release 0.4.0