Storage pool support
fixed annotations
Merge pull request #258 from daniellemayne/develop

Storage pool support