Ruofan Xu

Hi, sorry for bumping this, but will this be merged anytime soon? I got the same problem and would need this fix :) @scpeters @chapulina