Merge pull request #18 from Infinity-3A3/master

sync Raed from master
Merge pull request #19 from Infinity-3A3/Raed

Merge pull request #18 from Infinity-3A3/master