#19 use manual imports
Merge pull request #46 from if1live/feature/manual-import

use manual imports