Code cleanup and change read timeout to infinite.
Merge pull request #6 from avaliani/code-cleanup

Code cleanup and change read timeout to infinite.