Cleaned up your code a little bit.
Merge pull request #3 from thvd/patch-1

Cleaned up your code a little bit.