Merge pull request #21 from finnjohansen/master

Pull
Merge pull request #6 from UbiCollab/master

Merge pull request #21 from finnjohansen/master