Fixed imports. Closes #9