Merge pull request #4 from ikenchina/master

123