Improved uniqueness of defaultClient

relates to issue #26