Replace use of Zero with Default now that Zero requires that Add also be implemented
Add in a call to unwrap() now that last() returns an Option
Merge pull request #23 from DaGenix/fix-build-errors

Fix build errors