Merge pull request #1 from tatsuron/master

pull request