Bug #20 : add missing files, missing configurations, missing code lines for previous commits.