Some refinement on my module
Merge origin/master