Adding tingodb for persistence.
Merge remote-tracking branch 'origin/master'