Hu Jin

@ynyany As you are the original author of this part of the code, can you please review?

@austoonz To keep the history clean I have rebased two new commits of addressing review comments into the original commit, therefore it might be a little hard to see the...