Merge pull request #5 from Donnervoegel/master

Pull request
Updated Data Persistence in response to TA comments

For the 5th time...
Merge pull request #119 from Contramalgra/master

Updated Data Persistence in response to TA comments