Modified to the stable version
Merged ok