Importers, and bug fixes
Merge branch 'master' of https://github.com/Ener-Getick/v3