Merge pull request #23 from finnjohansen/master

update
Merge pull request #8 from UbiCollab/master

Merge pull request #23 from finnjohansen/master