Database updated & tested
fixed Database read bug
Merge remote-tracking branch 'origin/master'