Latest rust, cargo update
Merge fix