Changed back to an in memory database
Merge remote-tracking branch 'origin/master'