Edited imports. Closes #65