code
Merge pull request #1 from mmilidoni/master

code optimization