kindly merge with master changes : file names changes, bug removal
Merge details
merged
mentioned in commit 98e39881