Merge pull request #1 from sora083/develop

20140516test2 diff