Develop

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