Merge pull request #17 from finnjohansen/master

Sync with origin
Merge pull request #2 from UbiCollab/master

Merge pull request #17 from finnjohansen/master