Some update

/cc #12