Merge pull request #31 from rasmusprentow/master

Pull up