Merge pull request #1378 from rafaelstz/patch-4

Setup of the development environment.