#38 do some clean-up
Merge development
ClientServer only do setup
Merge pull request #43 from TheTaz/do_clean_up

#38 do some clean-up