Rolling up some commits
Merge branch 'master' of https://github.com/mtolan/ColdStorage