Merge pull request #480 from eire1130/custom_storage_key

Custom storage key
Merge remote-tracking branch 'upstream/master' into custom_storage_key