Merge pull request #2 from rasmusprentow/master

Pull into Zebr