update to kangax master