Merge pull request #33 from rasmusprentow/master

Merging
Merge pull request #36 from rasmusprentow/master

Pulling into Zebr
Merge pull request #37 from rasmusprentow/zebr

Zebr