Fixed imports, closes #164