Added support for null values
Updated to latest okhttp library