Submitted by: asami
(Closes PR #1794.) Submitted by: nakai@mlab.t.u-tokyo.ac.jp
Submitted by: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>