Merge pull request #69 from shwetank/master

system.storage addition
Merge pull request #70 from shwetank/master

minor fixes to system.storage filename