Merge pull request #48 from rasmusprentow/master

Downstream
Merge pull request #49 from rasmusprentow/zebr

Merge pull request #48 from rasmusprentow/master