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

Fix unwrap deprecation warnings.