Improved save management and made code more efficient
Merge pull request #115 from fabian1995/master

Improved save management and made code more efficient