Use correct transport
Merged .gitignore
Merge branch 'master' into dev
Configuration represented by a class.