Merge pull request #1 from rainjay/master

this is a test
for tamamadesu