Develop

Unifying the branches for continuous integration