Add Marcopolo
Merge pull request #2204 from nlamirault/master

Add Marcopolo