Change cvs and fix #10

Fix #10 
Resolve errors of the first commit and the old CVS (SVN).