Merge pull request #1 from goldenice/master

Update from original
Better way to determine savers
Merge pull request #7 from JochemKuijpers/master

Better way to determine savers