Updated curl class
Fixed issues with merge errors from henk