Merge pull request #27 from mirrorcoder/master

[FIX] Refacroting init resources
Command wrapper