cvs via ssh; tweak uwa
Merge pull request #2 from zaixingmao/fixes

cvs via ssh; tweak uwa