Develop

merge for RVIC 1.0.0