Merge pull request #14 from BorisVerk/master

corrected values in database
corrected server to work with new dataset