Merge pull request #22 from rasmusprentow/master

Pulling down