Merge pull request #25 from finnjohansen/master

Pull