Merge pull request #144 from RossMeikleham/master

Fix for changes to std::iter::Map
Fix for change of std::slice::Items to std::slice::Iter