Merge pull request #20 from finnjohansen/master

Update ubicollab
Merge pull request #5 from UbiCollab/master

Merge pull request #20 from finnjohansen/master