Fix unwrap deprecation warnings.
Merge pull request #21 from mrmonday/unwrap-fixes

Fix unwrap deprecation warnings.
Fixes for the latest Rust master.
Merge pull request #22 from mrmonday/rust-master-fixes

Fixes for the latest Rust master.