Optimizing code
Merge pull request #4 from wagnert/master

Optimizing code