Merge pull request #25 from gempio/master

I'm tired of this shit.
Stuff and stuff
Merge pull request #26 from HSkogmo/master

Stuff?