cURL overhaul
Merge pull request #248 from remear/curl-overhaul

cURL overhaul