performances improvement
Merge pull request #1 from mart-e/patch-1

[IMP] performances improvement - Courtesy of Mart-e