#138 - add default timeout
Fixed a typo
Merge pull request #47 from cronycle/feature/update-from-original-repo

Updates from the original repo