Merge pull request #48 from rasmusprentow/master

Downstream