Merge pull request #14 from rasmusprentow/master

Pulling the merge
Merge pull request #16 from rasmusprentow/master

Getting upstream
Merge pull request #17 from rasmusprentow/zebr

Zebr