Updates, Storage path string added, better comments.
Merge remote-tracking branch 'origin/master'