Comply with PEP 8 (#63)
Add timeout for network requests (#86)
Merge remote-tracking branch 'upstream/master'