Merge pull request #1 from AirBinary0/master

first
Merge pull request #2 from AirBinary0/Dev_5

Merge pull request #1 from AirBinary0/master