Improves core method performances
Merge pull request #1057 from nicolasbadia/core-speed-improvement

Improves core method performances