Refactor slightly
Merge branch 'master' of github.com:mneumann/rust-toml