Enable 32- and 64-bit cvs
Merge pull request #29 from 0xffea/cvs

Enable 32- and 64-bit cvs