Merge pull request #254 from antonblanchard/fix-verilator