Merge pull request #59 from cl0ck/Dev

AutoSave