Updated version of the link to the article by Rui
Merge remote-tracking branch 'upstream/pr/116' into RefactoringCore