merge with upstream version at http://fiap-develop.gutp.ic.i.u-tokyo.ac.jp/dist/