Quote env variable
Merge remote-tracking branch 'origin/master' into develop
Updated some naming
Merge pull request #1 from ckaznocha/feature/update_variable_names

Feature/update variable names
Merge pull request #2 from ckaznocha/develop

Changed some names and fixed Travis-CI problem