This is pull request from Shinya's feature2 to develop branch