Merge pull request #56 from riscv/config