Fixed comment
Merge pull request #1 from riccist/metadata_import

Metadata import (work in progress)
Metadata import in progress
Cleanup and refactoring