Version 1.0.1 : merge fix