Added configurable timeouts and overridable version string
Merge pull request #20 from darkliquid/master

Added configurable timeouts and overridable version string