clean things up and try to make requests a bit more reliable
Merge pull request #1 from doy/master

clean things up and try to make requests a bit more reliable