Merge pull request #1 from portalsway2/master

first pull request
Merge pull request #2 from portalsway2/eee

Merge pull request #1 from portalsway2/master