Track Rust master
Merge pull request #39 from mikedilger/minorfixes

Track Rust master