Strict import organization
Merge pull request #9 from Geczy/master

Strict import organization