Makes some small optimization
Merge pull request #43 from cedricpinson/feature/optimization

Makes some small optimization