Fixed bug #16
Fixed persistance
resolve conflicts