Merge pull request #3 from heatherleaf/master

Adding support for parsing timeout