Merge pull request #1 from kai8406/M1

M1