Renamed folder
Merge remote-tracking branch 'origin/master' into Development-of-algorithm