Fix rebase conflict
Fix update process
Fix wrong link destination
Fix merge for 1.4
Merge pull request #13 from DeuxHuitHuit/2.3.3

2.3.3