Develop

Merged Stable version