Merge pull request #110 from riscv/bump_env