update 20130619 merge from kanpai