Merge pull request #25 from mirrorcoder/master

Fix bugs
Unify volume and image functionality
Merge pull request #26 from miarmak/volume_fixes

Unify volume and image functionality
[FIX] Refacroting init resources