Changes made by Tufan Ali (tufan.ali@outlook.com).