maki1-dev 1st commit