Minor modifications to "expand".
Added "iconv".