Feature/master/gh 123 unique environments

This pull request is based on GH-199.