Merge pull request #2 from pedrofvteixeira/master

Environment display