perfomance tweaks
Merge pull request #29 from BrandyMint/aleksxor/perfomance

perfomance tweaks