updates
added unit tests
Merge pull request #4 from ddewaele/dev_part2_persistence

Dev part2 persistence