Make the /storage option available only by demand and off by default, closes #117