I'm tired of this shit.
Merge pull request #25 from gempio/master

I'm tired of this shit.