fixed saving and loading closes #32