Merge pull request #12 from enolfc/master

Improve generated schema and code quality.
Avoid crash when storage is not defined in the yaml.

Fixes issue #13.