Merge pull request #25 from finnjohansen/master

Pull
Merge pull request #10 from UbiCollab/master

Merge pull request #25 from finnjohansen/master