Merge pull request #6 from sifive/remove-consts-vh