Oh gawd.
Merge pull request #2 from helior/master

Oh gawd.