Fuck

Did not really want to rewrite this.
Merge pull request #1 from germ/master

Features and fun stuff.