Merge pull request #21 from ggramlich/master

Some improvements on the persistence
fixed typo