bugfixes
Merge branch 'master' of https://github.com/lightsaber91/Web_Server