Develop

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