Modify some files
Merge pull request #45 from gagugagu/develop

Modify some files