Include Pedro's commit ded8766b and run our new test suite
Merge pull request #120 from ropensci/marianne-fix-marker-default

Include Pedro's commit ded8766b and run our new test suite