Merge pull request #1 from olaurino/develop

Develop
Merge branches 'develop' and 'master' of https://github.com/olaurino/volib into develop
improve imports in generated code

Also fix indentation in jinja2 templates.