Merge pull request #1 from kai8406/M3

M3