More efficient
Merge pull request #1 from Symmetryc/patch-1

More efficient