Fix imports
Merge pull request #12 from ncdc/master

Fix imports