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

some small fix :)