Tighten up the code
Merge pull request #2 from cclauss/patch-2

Tightened up the code

Thanks a lot :)