Merge pull request #15 from BorisVerk/master

corrected server to work with new dataset, updated dataset