Changed the import method
Merge pull request #20 from citruspi/import-fixes

Changed the import method