Fixed ClientHistory constructor bug
Bugfix for ClientHistory constructor
Merge branch 'iteration3' of https://github.com/NameCT/CIS into iteration3