GH #275 - Fixed imports.