fixed algorthim
Merge pull request #171 from kmabey/LocalDev

fixed algorthim
Merge pull request #172 from kmabey/dev

Dev
Merge pull request #173 from kmabey/qa

Qa