major refractor
Merge pull request #1 from masgoribas/new_summation

major refractor