Some fixes that was missed in commit yesterday.
Moved circle_generator into the class

maxnordlund wanted it.
Merge remote-tracking branch 'origin/dell_ETinterface' into dell_Server