Fix imports
Merge pull request #357 from mpharrigan/importfix

Fix imports