Bug fix in crash if you have no clients
Merge branch 'iteration3' of https://github.com/NameCT/CIS/ into iteration3