small changes to params
Merge branch 'master' of https://github.com/avivkiss/warp

Conflicts:
	server.py
merge should be ok now