vanessa submission
Merge pull request #20 from vjoho/master

vanessa submission