Some minor fixes
Merge pull request #6 from delafuente/changes_for_environments

Some minor fixes