Update code to use unwrap method.
Merge pull request #2 from metajack/option-unwrap

Update code to use unwrap method.