Update contributors
Merge pull request #174 from gabriele-v/master

Update contributors
Merge remote-tracking branch 'remotes/upstream/master' into develop