Changed to dev-master branch, Implemented environment variables