Bug fixes
merge
Merge branch 'master' of https://github.com/avivkiss/warp

Conflicts:
	handshake.py