Merge pull request #2 from movleax/this-is-better

No diggity