pickup history now has number of items picked up
Merge remote-tracking branch 'origin/master'