Develop

Merge develop into master to create new project stable version