Changes from server B
Merge branch 'master' of https://github.com/nyan-cat/easyweb