Merge branch 'alainmarcel-patch-1' after refactoring