Fix for issue #18 - create separate backup archives for each store

... plus some tidying up