Merge pull request #4 from Juniper/storage-module

Merge Storage module to master
Merge branch 'master' into storage-module