close issue #3, integrate kage