Improved performance
Merge pull request #10 from marzece/Optimizations

Improved performance