Added 'makeKey' parameter to store().
Merge branch 'develop'