Added support for descriptors that are single-valued strings or numbers (improve #4).