#18 - Added autosave feature