Merge pull request #53 from santhnm2/optimization

Optimization