Tan Si Kai

Results 2 comments of Tan Si Kai

@ser94mor i think we can go ahead merging this into master, is there any other issue? i fixed the merge conflict.