Block-storage integration
Code now takes Blockstorge into account
Merge pull request #18 from jtaleric/master

Block Storage integration.