Develop

Unifying the branches for continuous integration
Line is too long. [85/80]