update 20130511 kyo merged