Merge pull request #1 from sora083/develop

20140516test2
Merge pull request #2 from sora083/master

Merge pull request #1 from sora083/develop