20130609_Add_Self_Signer_Support