Merge final commits to the master branch

Merge the final version of the 3 files