- Added Server Timeout option (from fork source)
- Code cleaning (PEP8)