merge rvirding into mine 

merge rvirding into mine