created branch, added optional files
substituted all protocol occurences
Merge pull request #2 from mpaciore/switchable-environment

Switchable environment