Merge pull request #2 from rasmusprentow/master

Pull into Zebr
Merge pull request #3 from rasmusprentow/zebr

Merge pull request #2 from rasmusprentow/master