Fixes #1 Added auto-save option