Stuff and stuff
Merge pull request #26 from HSkogmo/master

Stuff?