Merge pull request #1 from TakeshiTseng/master

pull master