Fix command line create/restore
Merge pull request #328 from Zomnut/master

Fix command line create/restore