Merge pull request #26 from HSkogmo/master

Stuff?
More webs