handling null values a lot better
version bump