Switched from local imports back to full imports
Merge pull request #2 from elgris/import_fix

Switched from local imports back to full imports