Closes #94 (closed)
Note that this MR does not change the import process. I'm opening a new issue for that.