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

sync Raed from master