Fixed Incorrect Merge

Tried merging branch Rui into Master, but merged in the wrong order.