Improved code efficiency
Merge pull request #6 from RoyalAliceAcademyOfSciences/master

Improved code efficiency