Merge pull request #1 from s2node/develop

test commit
rebase test
Merge pull request #2 from s2node/master

masterの修正をdevelopに反映