Merge pull request #329 from yayachiken/master