Fix Issue #2 and HttpClient threading issues