Merge pull request #21 from finnjohansen/master

Pull