code optimization
Merge pull request #3 from oadiego/master

Code optimization