This simplifies the API by making sure that the filenames are only provided in one place (the calls to save and load).
Closes #122 (closed)