Work on server
merge master into alex
Merge pull request #2 from unblevable/alex

Alex
Merge branch 'master' into ray