Toshiaki Ara (Univ) Merge branch 'master' of github.com:toshi-ara/CIplot