Closes #191 - added saving