Joaquim on boat
Merge pull request #7 from joaquimserafim/master

add Joaquim