Update 1.5.1

Huge modification of the module