Rename Singleton's method
Merge branch 'improve_singleton' into develop