Fixed import, and refactor issue
Merge pull request #35 from RWOverdijk/hotfix/import

Fixed import, and refactor issue