Update #9
Code optimize
Merge pull request #1 from Hammermaps-DEV/master

Update