Quick optimization
Merge pull request #97 from chylex/master

Quick optimization