Code optimization
Merge pull request #1 from amitanjani/master

Code optimization