Added filename parameter for Save() and Load()