Merge pull request #7 from lizportnoy/serverFixes#3

Server fixes#3
edits
fixed authentication