Merge pull request #1 from ancafarcas/master

testing the pull request
Merge pull request #2 from ancafarcas/upstream

Merge pull request #1 from ancafarcas/master