Pedro Caseiro

Results 3 issues of Pedro Caseiro

Had to reopen the PR to rerun travis, since it was failing with a strange error

cc @muan @mislav