Optimized
Merge pull request #3 from SoulByte/patch-2

Optimized