Merge develop into master branch

Update the baseline of the project