better import
should naming client instead of server
Merge pull request #8 from moonshadow/small_fix

some small fix :)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/test_connectivity.py
	tests/test_load.py