Merge pull request #1 from soonhokong/master

minor improvement
replace.cpp rv_name + space case
Merge pull request #2 from soonhokong/master

minor minor fixes