Fix imports
Merge pull request #370 from rivera-ernesto/fix_imports

Fix imports