Fixing imports, issue #60