Merge pull request #26 from M2Ys4U/master