Merge pull request #18 from finnjohansen/master

Update ubicollab
Merge pull request #3 from UbiCollab/master

Merge pull request #18 from finnjohansen/master