Refactorized the code
Fixed the missing data bug on the multipool
Merge pull request #1 from lenormf/master

Refactorized the code