Added storage support
Merge pull request #2 from lukaszkusy/feature/OPOMCB-2

Added storage support code reviewed