Develop

Unifying the branches for continuous integration
Inconsistent indentation detected.